Move an assert to the right place. (#341661, Pascal Terjan)

2006-05-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_allocate_children): Move
	an assert to the right place.  (#341661, Pascal Terjan)

diff --git a/ChangeLog b/ChangeLog
index 2180aab0b1a69e50e190fdb9c0d55b24b80d9641..f70c95b87cf8af9eff0f6fc3777523cb3b1ec7e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_allocate_children): Move
+       an assert to the right place.  (#341661, Pascal Terjan)
+
 2006-05-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtknotebook.c: Fix some corner cases in the size

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2180aab0b1a69e50e190fdb9c0d55b24b80d9641..f70c95b87cf8af9eff0f6fc3777523cb3b1ec7e6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-05-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_allocate_children): Move
+       an assert to the right place.  (#341661, Pascal Terjan)
+
 2006-05-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtknotebook.c: Fix some corner cases in the size

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index ad5825994a99acbc6626f72ccba91e601fe12cb6..49b5dc24781c5244237dbb13bf0e8deb4467f2d7 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2901,6 +2901,8 @@ gtk_text_view_allocate_children (GtkTextView *text_view)
     {
       GtkTextViewChild *child = tmp_list->data;
 
+      g_assert (child != NULL);
+          
       if (child->anchor)
         {
           /* We need to force-validate the regions containing
@@ -2933,8 +2935,6 @@ gtk_text_view_allocate_children (GtkTextView *text_view)
           GtkAllocation allocation;          
           GtkRequisition child_req;
              
-          g_assert (child != NULL);
-          
           allocation.x = child->x;
           allocation.y = child->y;